Make gtk_printer_get_capabilities public, and move the

2007-04-30  Christian Persch  <chpe@gnome.org>

	* docs/reference/gtk/gtk-sections.txt:
	* gtk/gtk.symbols:
	* gtk/gtkprinter-private.h:
	* gtk/gtkprinter.c: (gtk_printer_get_capabilities),
	(gtk_print_capabilities_get_type):
	* gtk/gtkprinter.h:
	* gtk/gtkprintjob.c:
	* gtk/gtkprintjob.h:
	* gtk/gtkprintunixdialog.c: (selected_printer_changed):
	Make gtk_printer_get_capabilities public, and move the
	GtkPrintCapabilities definition to gtkprinter.h. Bug #390437.

svn path=/trunk/; revision=17747

diff --git a/ChangeLog b/ChangeLog
index 5b900a606fd7880c0975b6d5ae305cfed417224a..caa9f6c3dd6fdfa31aaca3f2a971581e31037599 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
        * gtk/gtkprinter.c: (gtk_printer_get_capabilities),
        (gtk_print_capabilities_get_type):
        * gtk/gtkprinter.h:
+       * gtk/gtkprintjob.c:
+       * gtk/gtkprintjob.h:
        * gtk/gtkprintunixdialog.c: (selected_printer_changed):
        Make gtk_printer_get_capabilities public, and move the
        GtkPrintCapabilities definition to gtkprinter.h. Bug #390437.

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index 0edf240d5f6f550dc7be801c1df94ea38b21e9db..d9ff9cdc55d1227fc413469fdfcd14e774be3c50 100644 (file)
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -682,31 +682,6 @@ gtk_print_job_send (GtkPrintJob             *job,
                                   callback, user_data, dnotify);
 }
 
-GType
-gtk_print_capabilities_get_type (void)
-{
-  static GType etype = 0;
-
-  if (etype == 0)
-    {
-      static const GFlagsValue values[] = {
-        { GTK_PRINT_CAPABILITY_PAGE_SET, "GTK_PRINT_CAPABILITY_PAGE_SET", "page-set" },
-        { GTK_PRINT_CAPABILITY_COPIES, "GTK_PRINT_CAPABILITY_COPIES", "copies" },
-        { GTK_PRINT_CAPABILITY_COLLATE, "GTK_PRINT_CAPABILITY_COLLATE", "collate" },
-        { GTK_PRINT_CAPABILITY_REVERSE, "GTK_PRINT_CAPABILITY_REVERSE", "reverse" },
-        { GTK_PRINT_CAPABILITY_SCALE, "GTK_PRINT_CAPABILITY_SCALE", "scale" },
-        { GTK_PRINT_CAPABILITY_GENERATE_PDF, "GTK_PRINT_CAPABILITY_GENERATE_PDF", "generate-pdf" },
-        { GTK_PRINT_CAPABILITY_GENERATE_PS, "GTK_PRINT_CAPABILITY_GENERATE_PS", "generate-ps" },
-        { GTK_PRINT_CAPABILITY_PREVIEW, "GTK_PRINT_CAPABILITY_PREVIEW", "preview" },
-        { 0, NULL, NULL }
-      };
-
-      etype = g_flags_register_static (I_("GtkPrintCapabilities"), values);
-    }
-
-  return etype;
-}
-
 
 #define __GTK_PRINT_JOB_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 9d538c2cb10545838e564405177effc0163165dc..24733d388a57ade1f01b7c3c74d0c85474f5b011 100644 (file)
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -34,21 +34,6 @@ G_BEGIN_DECLS
 #define GTK_IS_PRINT_JOB_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_JOB))
 #define GTK_PRINT_JOB_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJobClass))
 
-/* Note, this type is manually registered with GObject in gtkprintjob.c
- * If you add any flags, update the registration as well 
- */
-typedef enum
-{
-  GTK_PRINT_CAPABILITY_PAGE_SET     = 1 << 0,
-  GTK_PRINT_CAPABILITY_COPIES       = 1 << 1,
-  GTK_PRINT_CAPABILITY_COLLATE      = 1 << 2,
-  GTK_PRINT_CAPABILITY_REVERSE      = 1 << 3,
-  GTK_PRINT_CAPABILITY_SCALE        = 1 << 4,
-  GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5,
-  GTK_PRINT_CAPABILITY_GENERATE_PS  = 1 << 6,
-  GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7
-} GtkPrintCapabilities;
-
 typedef struct _GtkPrintJob          GtkPrintJob;
 typedef struct _GtkPrintJobClass     GtkPrintJobClass;
 typedef struct _GtkPrintJobPrivate   GtkPrintJobPrivate;